From 72ded1ca58ec4ff80218e7b44615e3545cd0bc8e Mon Sep 17 00:00:00 2001 From: "iap10@labyrinth.cl.cam.ac.uk" Date: Mon, 2 Aug 2004 21:55:32 +0000 Subject: [PATCH] bitkeeper revision 1.1108.52.1 (410eb854DZhEQqBAsiFdxS10QzU2Sg) Avoid putting ip= on linux command line unless the user actually wants an address set or is using kernel dhcp. --- tools/python/xen/xm/create.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/python/xen/xm/create.py b/tools/python/xen/xm/create.py index e8d7957361..286e1d3478 100644 --- a/tools/python/xen/xm/create.py +++ b/tools/python/xen/xm/create.py @@ -354,18 +354,17 @@ def preprocess_vifs(opts, vals): vals.vif = vifs def preprocess_ip(opts, vals): - setip = (vals.hostname or vals.netmask - or vals.nfs_server - or vals.gateway or vals.dhcp or vals.interface) - if not setip: return - dummy_nfs_server = '1.2.3.4' - ip = (vals.ip + if vals.ip or vals.dhcp != 'off': + dummy_nfs_server = '1.2.3.4' + ip = (vals.ip + ':' + (vals.nfs_server or dummy_nfs_server) + ':' + vals.gateway + ':' + vals.netmask + ':' + vals.hostname + ':' + vals.interface + ':' + vals.dhcp) + else: + ip = '' vals.cmdline_ip = ip def preprocess_nfs(opts, vals): -- 2.30.2